From: Deniz Dogan <deniz@dogan.se>
Date: Tue, 28 Jun 2011 11:23:01 +0000 (+0200)
Subject: * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped selectors.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3275
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d8e9126fbf7c858d18704ff9af65f35311bcbae3;p=emacs.git

* textmodes/css-mode.el (css-font-lock-keywords): Fix grouped selectors.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a017eae2ab..a595c2e2d56 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-28  Deniz Dogan  <deniz@dogan.se>
+
+	* textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
+	selectors (Bug#5732).
+
 2011-06-27  Jari Aalto  <jari.aalto@cante.net>
 
 	* eshell/em-ls.el: Display `ls -l' dates in ISO format (Bug#8440).
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index ef51fb25035..0a8f0b303c9 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -240,7 +240,7 @@
     ;; thus prevent this highlighting from being applied (actually now that
     ;; I use `append' this should work better).  But really the part of hte
     ;; selector between [...] should simply not be highlighted.
-    (,(concat "^\\([ \t]*[^@:{\n][^:{\n]+\\(?::" (regexp-opt css-pseudo-ids t)
+    (,(concat "^\\([ \t]*[^@:{}\n][^:{}]+\\(?::" (regexp-opt css-pseudo-ids t)
               "\\(?:([^)]+)\\)?[^:{\n]*\\)*\\)\\(?:\n[ \t]*\\)*{")
      (1 'css-selector append))
     ;; In the above rule, we allow the open-brace to be on some subsequent